Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

conflict detector(cdc): fix potential dead lock when a transaction generated multiple same hash (#10335) #10367

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #10335

What problem does this PR solve?

Issue Number: close #10334

What is changed and how it works?

  • Deduplicate the generated hash in a single transaction to prevent self cyclic dependency in the conflict detector.
  • Refine the conflict detector, make it more readable

Check List

Tests

  • Unit test

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

Fix sink-to-mysql checkpoint-ts stuck issue in some rare cases.

Signed-off-by: zhangjinpeng1987 <[email protected]>
Signed-off-by: zhangjinpeng1987 <[email protected]>
Signed-off-by: zhangjinpeng1987 <[email protected]>
Signed-off-by: zhangjinpeng1987 <[email protected]>
@ti-chi-bot ti-chi-bot added lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Dec 27, 2023
@zhangjinpeng87
Copy link
Contributor

/test verify

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 27, 2023
@zhangjinpeng87 zhangjinpeng87 requested a review from hicqu December 28, 2023 02:06
Copy link
Contributor

ti-chi-bot bot commented Dec 28, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: asddongmen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Dec 28, 2023
@ti-chi-bot ti-chi-bot bot merged commit 39aa61a into pingcap:release-6.5 Dec 28, 2023
9 of 10 checks passed
@hicqu hicqu deleted the cherry-pick-10335-to-release-6.5 branch December 28, 2023 02:54
@asddongmen asddongmen added the area/ticdc Issues or PRs related to TiCDC. label Dec 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved area/ticdc Issues or PRs related to TiCDC. cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants